Basic components

Header
The Header shows which files and which versions of the files are being compared. If two files are compared, the header displays the two filenames; if versions are compared, the filename and the two versions are displayed (as shown in the illustration below). The special version

WORK denotes the current working file; the version HEAD denotes the latest version of the file. A third version that can be used for comparison is SHARED , which refers to the version of the shared file (in the Shared Source Working Environment). Please refer to the Glossary for a definition of working file and shared file.

Differences View
The Differences View displays the differences in the compared files/versions. Areas of code containing differences are split into two views and separated by a Merge button. An area where the two files/versions are the same is not split.

The Differences View shows two- or three-way differences. The Merge button between the working file and the compared file(s)/version(s) allows you to merge differences into the working file. If the working file is not writable, or if two versions of the same file are being compared, the Merge button is disabled.
Merged differences are shown in italics in the Differences List.
File List
The files shown in the File List depend on your selections in other views. The list contains only one file if the Diff/Merge tool compares two versions of a single file.
Clicking on a file loads the file into the Diff/Merge tool and shows the differences between the corresponding versions.
Differences List
The Differences List shows all the differences between the files/versions. The line number and the name of the symbol that contains the difference are provided.
Entries in italics indicate a difference that has already been merged.